Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BugFix] Fix Java UDAF OOM in spill or sorted streaming agg (backport #48618) #48672

Closed
wants to merge 1 commit into from
Closed

[BugFix] Fix Java UDAF OOM in spill or sorted streaming agg (backport #48618) #48672

wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 22, 2024 •
edited by wanpengfei-git
Loading

Why I'm doing:

In past implementations, Function States would not be released.

For sorted streaming agg or spill aggregates, they will not be released even if destroy is called.

What I'm doing:

This PR adds a remove state interface to Function States.

After calling destroy, it will call function states-> remove.

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Bugfix cherry-pick branch check:

  • I have checked the version labels which the pr will be auto-backported to the target branch
    • 3.3
    • 3.2
    • 3.1
    • 3.0
    • 2.5
This is an automatic backport of pull request #48618 done by [Mergify](https://mergify.com). ## Why I'm doing:

In past implementations, Function States would not be released.

For sorted streaming agg or spill aggregates, they will not be released even if destroy is called.

What I'm doing:

This PR adds a remove state interface to Function States.

After calling destroy, it will call function states-> remove.

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

@stdpain @mergify
[BugFix] Fix Java UDAF OOM in spill or sorted streaming agg (#48618)
8f87f45 
Signed-off-by: stdpain <[email protected]>
(cherry picked from commit 36b3aae)

# Conflicts:
#	be/src/exprs/function_context.cpp
@mergify mergify bot added the conflicts label Jul 22, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Jul 22, 2024

Cherry-pick of 36b3aae has failed:

On branch mergify/bp/branch-3.0/pr-48618
Your branch is up to date with 'origin/branch-3.0'.

You are currently cherry-picking commit 36b3aae8db.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   be/src/exec/aggregator.cpp
	modified:   be/src/exprs/agg/java_udaf_function.cpp
	modified:   be/src/exprs/agg/java_udaf_function.h
	modified:   be/src/exprs/agg/java_window_function.cpp
	modified:   be/src/exprs/function_context.h
	modified:   be/src/udf/java/java_udf.cpp
	modified:   be/src/udf/java/java_udf.h
	modified:   java-extensions/udf-extensions/src/main/java/com/starrocks/udf/FunctionStates.java
	modified:   java-extensions/udf-extensions/src/main/java/com/starrocks/udf/UDFHelper.java
	new file:   java-extensions/udf-extensions/src/test/java/com/starrocks/udf/FunctionStatesTest.java
	new file:   test/sql/test_udf/R/test_jvm_udf
	new file:   test/sql/test_udf/T/test_jvm_udf

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   be/src/exprs/function_context.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Jul 22, 2024
Merged
24 tasks
@mergify mergify bot closed this Jul 22, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Jul 22, 2024

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

@mergify mergify bot deleted the mergify/bp/branch-3.0/pr-48618 branch July 22, 2024 06:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@stdpain stdpain

Labels
automerge conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@stdpain